Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 15 Aug 2010 22:50:44 +0000 (22:50 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 15 Aug 2010 22:50:44 +0000 (22:50 +0000)
commitb76f65eccb347910102bd0a0236c5b6bfa3daf22
treed684178c9a272be3150c47bd453b537ef018e7d9
parent61e55c7a3b56ffc52c876df01b4b8a4463923e6b
parentea3936f1089cea6037f93a17c42d1517114908c7
Merge from mainline.